Autogenerated HTML docs for v1.9.0-167-g38436
diff --git a/git-config.html b/git-config.html index d195d0c..bd7be81 100644 --- a/git-config.html +++ b/git-config.html
@@ -1478,7 +1478,7 @@ <dd> <p> Set this variable to <em>false</em> if you want to disable - <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>, + <em>pushNonFFCurrent</em>, <em>pushNonFFMatching</em>, <em>pushAlreadyExists</em>, <em>pushFetchFirst</em>, and <em>pushNeedsForce</em> simultaneously. @@ -1494,18 +1494,6 @@ </p> </dd> <dt class="hdlist1"> -pushNonFFDefault -</dt> -<dd> -<p> - Advice to set <em>push.default</em> to <em>upstream</em> or <em>current</em> - when you ran <a href="git-push.html">git-push(1)</a> and pushed <em>matching - refs</em> by default (i.e. you did not provide an explicit - refspec, and no <em>push.default</em> configuration was set) - and it resulted in a non-fast-forward error. -</p> -</dd> -<dt class="hdlist1"> pushNonFFMatching </dt> <dd> @@ -5351,7 +5339,7 @@ <div class="paragraph"><p>When pushing to a remote that is different from the remote you normally pull from, work as <tt>current</tt>. This is the safest option and is suited for beginners.</p></div> -<div class="paragraph"><p>This mode will become the default in Git 2.0.</p></div> +<div class="paragraph"><p>This mode has become the default in Git 2.0.</p></div> </li> <li> <p> @@ -5371,8 +5359,8 @@ suitable for pushing into a shared central repository, as other people may add new branches there, or update the tip of existing branches outside your control.</p></div> -<div class="paragraph"><p>This is currently the default, but Git 2.0 will change the default -to <tt>simple</tt>.</p></div> +<div class="paragraph"><p>This used to be the default, but not since Git 2.0 (<tt>simple</tt> is the +new default).</p></div> </li> </ul></div> </div></div>
